Clean up internal libxc functions to take 'const char *'

parameters where possible, to avoid unnecessary casts.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c
index 6b6bd11048815d3ea56b3e39fc892e2d925cfc82..facbe5a42dec8d6f67503c241b471aa11d23d83b 100644 (file)
--- a/tools/libxc/xc_hvm_build.c
+++ b/tools/libxc/xc_hvm_build.c
@@ -623,7 +623,7 @@ int xc_hvm_build(int xc_handle,
 int xc_hvm_build_mem(int xc_handle,
                      uint32_t domid,
                      int memsize,
-                     char *image_buffer,
+                     const char *image_buffer,
                      unsigned long image_size,
                      unsigned int vcpus,
                      unsigned int pae,

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index 0ef57241094477f189cd19590b432bf4064f70a4..0635d68fd8907517530f0dd9a822ac873780f8a0 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -117,7 +117,7 @@ static int parse_features(
     return -EINVAL;
 }
 
-static int probeimageformat(char *image,
+static int probeimageformat(const char *image,
                             unsigned long image_size,
                             struct load_funcs *load_funcs)
 {
@@ -407,7 +407,7 @@ extern unsigned long xc_ia64_fpsr_default(void);
 static int setup_guest(int xc_handle,
                        uint32_t dom,
                        const char *image, unsigned long image_size,
-                       char *initrd, unsigned long initrd_len,
+                       const char *initrd, unsigned long initrd_len,
                        unsigned long nr_pages,
                        unsigned long *pvsi, unsigned long *pvke,
                        unsigned long *pvss, vcpu_guest_context_t *ctxt,
@@ -541,7 +541,7 @@ static int setup_guest(int xc_handle,
 static int setup_guest(int xc_handle,
                        uint32_t dom,
                        const char *image, unsigned long image_size,
-                       char *initrd, unsigned long initrd_len,
+                       const char *initrd, unsigned long initrd_len,
                        unsigned long nr_pages,
                        unsigned long *pvsi, unsigned long *pvke,
                        unsigned long *pvss, vcpu_guest_context_t *ctxt,
@@ -586,13 +586,13 @@ static int setup_guest(int xc_handle,
     unsigned long shadow_mode_enabled;
     uint32_t supported_features[XENFEAT_NR_SUBMAPS] = { 0, };
 
-    rc = probeimageformat((char *)image, (unsigned long)image_size, &load_funcs);
+    rc = probeimageformat(image, image_size, &load_funcs);
     if ( rc != 0 )
         goto error_out;
 
     memset(&dsi, 0, sizeof(struct domain_setup_info));
 
-    rc = (load_funcs.parseimage)((char *)image, (unsigned long)image_size, &dsi);
+    rc = (load_funcs.parseimage)(image, image_size, &dsi);
     if ( rc != 0 )
         goto error_out;
 
@@ -700,7 +700,7 @@ static int setup_guest(int xc_handle,
         goto error_out;
     }
 
-    (load_funcs.loadimage)((char *)image, image_size,
+    (load_funcs.loadimage)(image, image_size,
                            xc_handle, dom, page_array,
                            &dsi);
 
@@ -959,7 +959,7 @@ static int setup_guest(int xc_handle,
 
 static int xc_linux_build_internal(int xc_handle,
                                    uint32_t domid,
-                                   const char *image,
+                                   char *image,
                                    unsigned long image_size,
                                    char *initrd,
                                    unsigned long initrd_len,
@@ -1119,9 +1119,9 @@ static int xc_linux_build_internal(int xc_handle,
 
 int xc_linux_build_mem(int xc_handle,
                        uint32_t domid,
-                       char *image_buffer,
+                       const char *image_buffer,
                        unsigned long image_size,
-                       char *initrd,
+                       const char *initrd,
                        unsigned long initrd_len,
                        const char *cmdline,
                        const char *features,
@@ -1165,7 +1165,7 @@ int xc_linux_build_mem(int xc_handle,
     }
     else
     {
-        ram_buf = initrd;
+        ram_buf = (char *)initrd;
         ram_len = initrd_len;
     }
 

diff --git a/tools/libxc/xc_load_aout9.c b/tools/libxc/xc_load_aout9.c
index 9a6ce0be41f228dcbcc9940e5b6ffd70d1dd16aa..22cd651057a515dab73d463bb20893a73fa62c3c 100644 (file)
--- a/tools/libxc/xc_load_aout9.c
+++ b/tools/libxc/xc_load_aout9.c
@@ -12,20 +12,19 @@
 #error "Unsupported architecture"
 #endif
 
-
 #define round_pgup(_p)    (((_p)+(PAGE_SIZE-1))&PAGE_MASK)
 #define KZERO             0x80000000
 #define KOFFSET(_p)       ((_p)&~KZERO)
 
-static int parseaout9image(char *, unsigned long, struct domain_setup_info *);
-static int loadaout9image(char *, unsigned long, int, uint32_t, unsigned long *, struct domain_setup_info *);
-static void copyout(int, uint32_t, unsigned long *, unsigned long, void *, int);
-struct Exec *get_header(char *, unsigned long, struct Exec *);
+static int parseaout9image(const char *, unsigned long, struct domain_setup_info *);
+static int loadaout9image(const char *, unsigned long, int, uint32_t, unsigned long *, struct domain_setup_info *);
+static void copyout(int, uint32_t, unsigned long *, unsigned long, const char *, int);
+struct Exec *get_header(const char *, unsigned long, struct Exec *);
 
 
 int 
 probe_aout9(
-    char *image,
+    const char *image,
     unsigned long image_size,
     struct load_funcs *load_funcs)
 {
@@ -43,7 +42,7 @@ probe_aout9(
 
 static int 
 parseaout9image(
-    char *image,
+    const char *image,
     unsigned long image_size,
     struct domain_setup_info *dsi)
 {
@@ -77,7 +76,7 @@ parseaout9image(
 
 static int 
 loadaout9image(
-    char *image,
+    const char *image,
     unsigned long image_size,
     int xch, uint32_t dom,
     unsigned long *parray,
@@ -111,7 +110,7 @@ copyout(
     int xch, uint32_t dom,
     unsigned long *parray,
     unsigned long addr,
-    void *buf,
+    const char *buf,
     int sz)
 {
     unsigned long pgoff, chunksz, off;
@@ -143,7 +142,7 @@ copyout(
  */
 struct Exec *
 get_header(
-    char *image,
+    const char *image,
     unsigned long image_size,
     struct Exec *ehdr)
 {

diff --git a/tools/libxc/xc_load_bin.c b/tools/libxc/xc_load_bin.c
index 4c771abbb8bc7def70a724aff179df50d90a0e49..49d3bdbfbbb2fa452c10d65b9574995ce4a4f0ac 100644 (file)
--- a/tools/libxc/xc_load_bin.c
+++ b/tools/libxc/xc_load_bin.c
@@ -99,23 +99,22 @@ struct xen_bin_image_table
 #define FLAGS_REQUIRED XEN_REACTOS_FLAG_ADDRSVALID
 
 static struct xen_bin_image_table *
-findtable(char *image, unsigned long image_size);
+findtable(const char *image, unsigned long image_size);
 static int
 parsebinimage(
-    char *image, unsigned long image_size, struct domain_setup_info *dsi);
+    const char *image, unsigned long image_size,
+    struct domain_setup_info *dsi);
 static int
 loadbinimage(
-    char *image, unsigned long image_size, int xch, uint32_t dom,
+    const char *image, unsigned long image_size, int xch, uint32_t dom,
     unsigned long *parray, struct domain_setup_info *dsi);
 
-int probe_bin(char *image,
+int probe_bin(const char *image,
               unsigned long image_size,
               struct load_funcs *load_funcs)
 {
-    if ( NULL == findtable(image, image_size) )
-    {
+    if ( findtable(image, image_size) == NULL )
         return -EINVAL;
-    }
 
     load_funcs->parseimage = parsebinimage;
     load_funcs->loadimage = loadbinimage;
@@ -124,7 +123,7 @@ int probe_bin(char *image,
 }
 
 static struct xen_bin_image_table *
-findtable(char *image, unsigned long image_size)
+findtable(const char *image, unsigned long image_size)
 {
     struct xen_bin_image_table *table;
     unsigned long *probe_ptr;
@@ -133,15 +132,12 @@ findtable(char *image, unsigned long image_size)
 
     /* Don't go outside the image */
     if ( image_size < sizeof(struct xen_bin_image_table) )
-    {
         return NULL;
-    }
+
     probe_count = image_size;
     /* Restrict to first 8k */
-    if ( 8192 < probe_count )
-    {
+    if ( probe_count > 8192 )
         probe_count = 8192;
-    }
     probe_count = (probe_count - sizeof(struct xen_bin_image_table)) /
                   sizeof(unsigned long);
 
@@ -165,7 +161,7 @@ findtable(char *image, unsigned long image_size)
     return NULL;
 }
 
-static int parsebinimage(char *image, 
+static int parsebinimage(const char *image, 
                          unsigned long image_size,
                          struct domain_setup_info *dsi)
 {
@@ -238,7 +234,7 @@ static int parsebinimage(char *image,
 
 static int
 loadbinimage(
-    char *image, unsigned long image_size, int xch, uint32_t dom,
+    const char *image, unsigned long image_size, int xch, uint32_t dom,
     unsigned long *parray, struct domain_setup_info *dsi)
 {
     unsigned long size;

diff --git a/tools/libxc/xc_load_elf.c b/tools/libxc/xc_load_elf.c
index b1fc2af4c0bd903ac5cf71f7281543f009a0c524..94c5c8708c13166e9c3a8d94cf5f3340032e374c 100644 (file)
--- a/tools/libxc/xc_load_elf.c
+++ b/tools/libxc/xc_load_elf.c
@@ -19,26 +19,25 @@
 
 static int
 parseelfimage(
-    char *image, unsigned long image_size, struct domain_setup_info *dsi);
+    const char *image, unsigned long image_size,
+    struct domain_setup_info *dsi);
 static int
 loadelfimage(
-    char *image, unsigned long image_size, int xch, uint32_t dom,
+    const char *image, unsigned long image_size, int xch, uint32_t dom,
     unsigned long *parray, struct domain_setup_info *dsi);
 static int
 loadelfsymtab(
-    char *image, int xch, uint32_t dom, unsigned long *parray,
+    const char *image, int xch, uint32_t dom, unsigned long *parray,
     struct domain_setup_info *dsi);
 
-int probe_elf(char *image,
+int probe_elf(const char *image,
               unsigned long image_size,
               struct load_funcs *load_funcs)
 {
     Elf_Ehdr *ehdr = (Elf_Ehdr *)image;
 
     if ( !IS_ELF(*ehdr) )
-    {
         return -EINVAL;
-    }
 
     load_funcs->parseimage = parseelfimage;
     load_funcs->loadimage = loadelfimage;
@@ -52,7 +51,7 @@ static inline int is_loadable_phdr(Elf_Phdr *phdr)
             ((phdr->p_flags & (PF_W|PF_X)) != 0));
 }
 
-static int parseelfimage(char *image, 
+static int parseelfimage(const char *image, 
                          unsigned long elfsize,
                          struct domain_setup_info *dsi)
 {
@@ -60,7 +59,8 @@ static int parseelfimage(char *image,
     Elf_Phdr *phdr;
     Elf_Shdr *shdr;
     unsigned long kernstart = ~0UL, kernend=0UL;
-    char *shstrtab, *guestinfo=NULL, *p;
+    const char *shstrtab;
+    char *guestinfo=NULL, *p;
     int h;
 
     if ( !IS_ELF(*ehdr) )
@@ -98,7 +98,7 @@ static int parseelfimage(char *image,
         if ( strcmp(&shstrtab[shdr->sh_name], "__xen_guest") != 0 )
             continue;
 
-        guestinfo = image + shdr->sh_offset;
+        guestinfo = (char *)image + shdr->sh_offset;
 
         if ( (strstr(guestinfo, "LOADER=generic") == NULL) &&
              (strstr(guestinfo, "GUEST_OS=linux") == NULL) )
@@ -171,7 +171,7 @@ static int parseelfimage(char *image,
 
 static int
 loadelfimage(
-    char *image, unsigned long elfsize, int xch, uint32_t dom,
+    const char *image, unsigned long elfsize, int xch, uint32_t dom,
     unsigned long *parray, struct domain_setup_info *dsi)
 {
     Elf_Ehdr *ehdr = (Elf_Ehdr *)image;
@@ -222,7 +222,7 @@ loadelfimage(
 
 static int
 loadelfsymtab(
-    char *image, int xch, uint32_t dom, unsigned long *parray,
+    const char *image, int xch, uint32_t dom, unsigned long *parray,
     struct domain_setup_info *dsi)
 {
     Elf_Ehdr *ehdr = (Elf_Ehdr *)image, *sym_ehdr;
@@ -271,8 +271,9 @@ loadelfsymtab(
              (shdr[h].sh_type == SHT_SYMTAB) )
         {
             if ( parray != NULL )
-                xc_map_memcpy(maxva, image + shdr[h].sh_offset, shdr[h].sh_size,
-                           xch, dom, parray, dsi->v_start);
+                xc_map_memcpy(maxva, image + shdr[h].sh_offset,
+                              shdr[h].sh_size,
+                              xch, dom, parray, dsi->v_start);
 
             /* Mangled to be based on ELF header location. */
             shdr[h].sh_offset = maxva - dsi->symtab_addr;

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index edf55d360ca2d39019fb0ac316e453da2a573d11..6234162b736fe2d0647538b39e24742d7fce741c 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -364,7 +364,7 @@ long xc_get_tot_pages(int xc_handle, uint32_t domid)
 int xc_copy_to_domain_page(int xc_handle,
                            uint32_t domid,
                            unsigned long dst_pfn, 
-                           void *src_page)
+                           const char *src_page)
 {
     void *vaddr = xc_map_foreign_range(
         xc_handle, domid, PAGE_SIZE, PROT_WRITE, dst_pfn);
@@ -410,7 +410,7 @@ unsigned long xc_get_filesz(int fd)
     return sz;
 }
 
-void xc_map_memcpy(unsigned long dst, char *src, unsigned long size,
+void xc_map_memcpy(unsigned long dst, const char *src, unsigned long size,
                    int xch, uint32_t dom, unsigned long *parray,
                    unsigned long vstart)
 {

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index f08fd25bc18d763a0ea1766077b75687bad2d820..07212b6f867f4f9b8f4bf7dd008de999ec853ac7 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -467,7 +467,7 @@ int xc_ia64_get_pfn_list(int xc_handle, uint32_t domid,
                          unsigned int start_page, unsigned int nr_pages);
 
 int xc_copy_to_domain_page(int xc_handle, uint32_t domid,
-                          unsigned long dst_pfn, void *src_page);
+                          unsigned long dst_pfn, const char *src_page);
 
 int xc_clear_domain_page(int xc_handle, uint32_t domid,
                          unsigned long dst_pfn);

diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h
index 2352ec33086e8147fe9967c65dd34517612a0738..23f5451d796942ed87c2ec69069b88823de916ea 100644 (file)
--- a/tools/libxc/xenguest.h
+++ b/tools/libxc/xenguest.h
@@ -90,9 +90,9 @@ int xc_linux_build(int xc_handle,
  */
 int xc_linux_build_mem(int xc_handle,
                        uint32_t domid,
-                       char *image_buffer,
+                       const char *image_buffer,
                        unsigned long image_size,
-                       char *initrd_buffer,
+                       const char *initrd_buffer,
                        unsigned long initrd_size,
                        const char *cmdline,
                        const char *features,
@@ -116,7 +116,7 @@ int xc_hvm_build(int xc_handle,
 int xc_hvm_build_mem(int xc_handle,
                      uint32_t domid,
                      int memsize,
-                     char *image_buffer,
+                     const char *image_buffer,
                      unsigned long image_size,
                      unsigned int vcpus,
                      unsigned int pae,

diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c
index 21a0985342e42365a65a91a7a96be06632a82c31..65aae5de500fe8f304a8ba587b53b62491f398d6 100644 (file)
--- a/tools/libxc/xg_private.c
+++ b/tools/libxc/xg_private.c
@@ -60,7 +60,7 @@ char *xc_read_image(const char *filename, unsigned long *size)
     return image;
 }
 
-char *xc_inflate_buffer(char *in_buf, unsigned long in_size,
+char *xc_inflate_buffer(const char *in_buf, unsigned long in_size,
                         unsigned long *out_size)
 {
     int           sts;
@@ -74,7 +74,7 @@ char *xc_inflate_buffer(char *in_buf, unsigned long in_size,
     {
         if ( out_size != NULL )
             *out_size = in_size;
-        return in_buf;
+        return (char *)in_buf;
     }
 
     out_len = in_buf[in_size-4] +

diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h
index b2ed8bab1b109ffb6fb866a14b8d2f4994416a7a..7974b1147bcd6aeefa0860fc2a7e6792a0bf641f 100644 (file)
--- a/tools/libxc/xg_private.h
+++ b/tools/libxc/xg_private.h
@@ -27,7 +27,7 @@
 
 
 char *xc_read_image(const char *filename, unsigned long *size);
-char *xc_inflate_buffer(char *in_buf,
+char *xc_inflate_buffer(const char *in_buf,
                         unsigned long in_size,
                         unsigned long *out_size);
 
@@ -145,9 +145,10 @@ struct domain_setup_info
     char *xen_guest_string;
 };
 
-typedef int (*parseimagefunc)(char *image, unsigned long image_size,
+typedef int (*parseimagefunc)(const char *image, unsigned long image_size,
                               struct domain_setup_info *dsi);
-typedef int (*loadimagefunc)(char *image, unsigned long image_size, int xch,
+typedef int (*loadimagefunc)(const char *image, unsigned long image_size,
+                             int xch,
                              uint32_t dom, unsigned long *parray,
                              struct domain_setup_info *dsi);
 
@@ -171,11 +172,11 @@ typedef struct mfn_mapper {
 } mfn_mapper_t;
 
 int xc_copy_to_domain_page(int xc_handle, uint32_t domid,
-                            unsigned long dst_pfn, void *src_page);
+                            unsigned long dst_pfn, const char *src_page);
 
 unsigned long xc_get_filesz(int fd);
 
-void xc_map_memcpy(unsigned long dst, char *src, unsigned long size,
+void xc_map_memcpy(unsigned long dst, const char *src, unsigned long size,
                    int xch, uint32_t dom, unsigned long *parray,
                    unsigned long vstart);
 
@@ -183,9 +184,12 @@ int pin_table(int xc_handle, unsigned int type, unsigned long mfn,
               domid_t dom);
 
 /* image loading */
-int probe_elf(char *image, unsigned long image_size, struct load_funcs *funcs);
-int probe_bin(char *image, unsigned long image_size, struct load_funcs *funcs);
-int probe_aout9(char *image, unsigned long image_size, struct load_funcs *funcs);
+int probe_elf(const char *image, unsigned long image_size,
+              struct load_funcs *funcs);
+int probe_bin(const char *image, unsigned long image_size,
+              struct load_funcs *funcs);
+int probe_aout9(const char *image, unsigned long image_size,
+                struct load_funcs *funcs);
 
 #endif